# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1160+1.1069.1.236 -> 1.1161 
#	arch/ia64/kernel/salinfo.c	1.11.1.2 -> 1.14   
#	arch/ia64/kernel/mca.c	1.41.1.10 -> 1.47   
#	         fs/Makefile	1.16.1.5 -> 1.23   
#	            Makefile	1.190.7.6 -> 1.254  
#
diff -Nru a/Makefile b/Makefile
--- a/Makefile	Fri Feb  6 13:33:14 2004
+++ b/Makefile	Fri Feb  6 13:33:14 2004
@@ -93,6 +93,7 @@
 
 CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes -Wno-trigraphs -O2 \
 	  -fno-strict-aliasing -fno-common
+CFLAGS += -g
 ifndef CONFIG_FRAME_POINTER
 CFLAGS += -fomit-frame-pointer
 endif
@@ -306,8 +307,7 @@
 	$(CONFIG_SHELL) scripts/Configure -d arch/$(ARCH)/config.in
 
 xconfig: symlinks
-	$(MAKE) -C scripts kconfig.tk
-	wish -f scripts/kconfig.tk
+	@echo -e "***\n* Sorry, xconfig is broken; use \"make menuconfig\" instead.\n***"
 
 menuconfig: include/linux/version.h symlinks
 	$(MAKE) -C scripts/lxdialog all
diff -Nru a/fs/Makefile b/fs/Makefile
--- a/fs/Makefile	Fri Feb  6 13:33:14 2004
+++ b/fs/Makefile	Fri Feb  6 13:33:14 2004
@@ -28,6 +28,7 @@
 subdir-$(CONFIG_EXT2_FS)	+= ext2
 subdir-$(CONFIG_CRAMFS)		+= cramfs
 subdir-$(CONFIG_RAMFS)		+= ramfs
+subdir-$(CONFIG_HUGETLBFS)	+= hugetlbfs
 subdir-$(CONFIG_CODA_FS)	+= coda
 subdir-$(CONFIG_INTERMEZZO_FS)	+= intermezzo
 subdir-$(CONFIG_MINIX_FS)	+= minix